Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 7 Apr 2010 21:51:48 +0000 (21:51 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 7 Apr 2010 21:51:48 +0000 (21:51 +0000)

Trivial merge